Merge "Avoid another concurrent modification exception in ShortcutHelper." into rvc-dev am: 831ac87a9b am: ed1fd6a0a2 am: c969dcbbab

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

Change-Id: I5cb42a9bbfe05adb250bdf68b17ab86199e3cb4e