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

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

Change-Id: I5592eaf614f3dfcfbd8ab57550af954cb26c3f8d