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

[automerger skipped] Merge "AppRestrictions - use vetted component" into tm-dev am: 66cf5441 am: c3ce0a7b -s ours am: f15a3569 -s ours am: 4c4f2ba4 -s ours am: 81d2c52e -s ours

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

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



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