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

[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-v2-dev am: 36200012 am: 60af57af -s ours

am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 359512cd is already in history

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

Change-Id: Ida822f0fcfa4ae4b7ad0eac6ffc221498a570504