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

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

Change-Id: Ife3c273f30b0ec1863e3d3c5d726466613a6a762