Merge "Removing private system ui flags from status bar flags logic." into nyc-mr1-dev