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 am: bc580004

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

Change-Id: Icb4e7b4e472e529e74545875c5f33e02e5f33c3a