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

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

Change-Id: I3901662322749595dc2ff3b0bc31ca7155fc7bc7