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

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



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