Merge "Fix issue with disable flags being set for the wrong user" into...

Merge "Fix issue with disable flags being set for the wrong user" into tm-qpr-dev am: 78e4e8ee am: a5bd452e am: 2985f855

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21487340



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