Merge "Fix NavigationBarColorTest" into stage-aosp-master