Merge "Fix allowlisting restricted permissions for secondary users on app...

Merge "Fix allowlisting restricted permissions for secondary users on app upgrade." into sc-dev am: c7db0e6f am: 466f24c1 am: 862a37a7

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

Change-Id: I76320c3ca3ebd3627238031bb4cdf93b1265c969