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