Merge "Protect shortcut files from corruption." into udc-dev am: 18c20c4d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21566608



Change-Id: I2ff4e29cf3a2f4f2d0515ab41c34b841dac1ba6a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>