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

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

Change-Id: I9c9b55169d591b6c64617a51dade82ee6d0f91c0