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

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

Change-Id: Ib1403c576adcfb397bd220f6e658b52a32440317