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

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



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