[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in...

[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-dev am: 2df76f60 -s ours am: 1ca7d315 -s ours am: 169e366a -s ours

am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 181c7e32 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16579588

Change-Id: I128ffd4275ce39f93e03ccb2f742f465c7e007ff