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

Change-Id: I231e73b9c88cd7a5c4d65f48f78e56294a6a94ab