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

[automerger skipped] Merge "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" into sc-qpr1-dev am: 36a989cd am: 781a615a -s ours am: d545a97f -s ours

am skip reason: Merged-In Iaa2d3a9497c3266babe0789961befc9776a4db7a with SHA-1 8e7cc8fa is already in history

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

Change-Id: I7c6a47280191b0cb6b57b45094685705f5d3affe