Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences"...

Merge "Check DISALLOW_APPS_CONTROL before performing reset app preferences" into tm-qpr-dev am: cfd4e87a am: 5cf9730c

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



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