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

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

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