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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8a269a3032af8a111682db99138949e1099751fd