Merge "Fix issue with sysui state flags not being committed" into tm-qpr-dev am: 846ed065

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



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