Merge "Properly protect ShortcutPackage#mShortcuts with synchronization lock."...

Merge "Properly protect ShortcutPackage#mShortcuts with synchronization lock." into tm-dev am: 645f51d3 am: 863df362 am: f65b37d1

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



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