Merge "Use more fine-grained lock when persisting shortcuts to disk" into...

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

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



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