Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into...

Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e44010 am: f2c5b7f2

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



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