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: Id4e6007456afd963de6ca3c0f9c1c1399028e5ce