Merge "Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba am: 52c75a50" into rvc-d1-dev-plus-aosp