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: fbfcf34d am: 87e25656

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

Change-Id: Icbdfa64f1a02b17a3eb067fd8ef4e22b983cba20