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

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



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