Merge "Fix error prone of AccessibilityShortcutControllerTest" into tm-qpr-dev am: b7a62a1561 am: 0c4d71c479

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

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