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

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

Change-Id: I5329a311e66072a6a6235f93c134f68d9994f861