Merge "Merge "Clean up system ui state flags" into qt-dev am: 4786a567 am:...
Merge "Merge "Clean up system ui state flags" into qt-dev am: 4786a567 am: 3ba8d293" into qt-r1-dev-plus-aosp
am: d30b70ea
Change-Id: If33d1a44bb994d8562f739473a77dd20f3907aa5