Merge "Use more fine-grained lock when persisting shortcuts to disk" into tm-dev am: 80ed9712

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



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