Merge "Force update the disable flags following status bar registration" into...

Merge "Force update the disable flags following status bar registration" into tm-qpr-dev am: ef1f84f5 am: 6d5ca42f

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



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