Merge "Merge "Merge "Clean up system ui state flags" into qt-dev am: 4786a567e8" into qt-dev-plus-aosp am: 39daaa8abb" into qt-r1-dev-plus-aosp
am: 7613c3a1aa

Change-Id: I4028ba940ab26dbd7c87eb5b1d516aa131ac84a7