Merge "Merge "Fix CtsShortcutHostTestCases#testSecondaryUser" into android10-tests-dev am: d200d089df" into android11-tests-dev am: d5163650db

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

Change-Id: I64cd7da357c4160797fb8005e8ed3b686e87b037