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

Merge "Merge "Extend set user protected packages for multi-user" into sc-dev am: cf5b205e am: ef9ab1a4" into sc-v2-dev-plus-aosp am: 8d4864d3

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

Change-Id: Ib99090eadea0615259abc8b30293ff5fabb27903