Merge "Merge "Clean up system ui state flags" into qt-dev am: 4786a567e8" into qt-dev-plus-aosp