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

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



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