Merge "Break the dependency between non-persistent user and shortcut users."...

Merge "Break the dependency between non-persistent user and shortcut users." into sc-dev am: 20dd0037

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

Change-Id: I398bbfaad517814c02f34aee1150350c21b99e72