Merge "Fix issue with sysui state flags not being committed" into tm-qpr-dev...

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

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



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