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

[automerger skipped] Merge "AppRestrictions - use vetted component" into udc-dev am: eec490e8 am: 86312206 -s ours am: ec134c53 -s ours

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

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



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