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