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

[automerger skipped] Merge "AppRestrictions - use vetted component" into tm-qpr-dev am: 8b47a673 -s ours

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

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



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