Merge "Protect shortcut files from corruption." into udc-dev am: 18c20c4dbc am: 56531f3ca7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21566608 Change-Id: Ida17f404efa1db3c4d9716c10c060ad06210245a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: