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: 5a6c88fe

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

Change-Id: I019bb34f82a81234ab8c1c4e2a13044365bb03ee