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

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

Change-Id: Ib2bd3a72da3377012c3fa90c8c05ce28aa72fc8d