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: I5c7867ed092176850407a03de3b43016380f4bc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>