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