Merge "Merge "Fix NavigationBarColorTest" into rvc-dev am: dd4a89ba am: 52c75a50" into rvc-d1-dev-plus-aosp am: 58ff205f

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

Change-Id: I4c8bbb51b3bae0e7dfd489c528ec41704b67fca8