Merge "Extend set user protected packages for multi-user" into sc-dev am:...

Merge "Extend set user protected packages for multi-user" into sc-dev am: cf5b205e am: 96dbff6f am: 87f41157

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

Change-Id: I2dfea79b29149d1d9998a3d731afb9dbca757b9d