Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev am: 831ac87a9b am: 58295346d8 am: a7424effb9 am: d2b9a9051c

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

Change-Id: I8f895b97c688cb0406c0f2390a74ecc9ad98d206