[automerger skipped] Merge "AppRestrictions - use vetted component" into...

[automerger skipped] Merge "AppRestrictions - use vetted component" into udc-qpr-dev am: 2f6e8fc2 -s ours

am skip reason: Merged-In Iff0d820c1261c29eb6703bf89194339cba700688 with SHA-1 d3e34060 is already in history

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



Change-Id: I039c1ae169233b873c24107fc3910125847a5a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>