Merge "Fix double status bar icons am: 12124d7eca am: 447991c67a am: 9570287870 am: 5f3ddc7d6d" into nyc-mr1-dev-plus-aosp