Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba14 am: 52c75a500b

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12203677

Change-Id: I3abb5638dac8d38d3237304bf94c4c011ce75fb1