Merge "Removing private system ui flags from status bar flags logic. am: ab216609f1 am: b7a673ed95 am: dccfd4394e"