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

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

Change-Id: Ic93a753e449ff60c95671a1ca728abec8fe67023