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

Merge "Properly protect ShortcutPackage#mShortcuts with synchronization lock." into tm-dev am: 645f51d3 am: 91ea048f am: 2cd91fce am: 8ba02c4c

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



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