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

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

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