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

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

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



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