Merge "Make “Reset app preferences” restricted by DISALLOW_APPS_CONTROL" into udc-dev am: f0e440109f
am: eb028da005
am: c5362c1c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155084 Change-Id: I106150778012cab3ed0ddf7135cb6a1832ea106b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: