[automerger skipped] Merge "Fix NavigationBarColorTest" into stage-aosp-master...

[automerger skipped] Merge "Fix NavigationBarColorTest" into stage-aosp-master am: cf7c807e -s ours am: 14aac87b -s ours am: ce81c5a4 -s ours am: 7c057b4e -s ours

am skip reason: Change-Id I68db516c91da69e0f4dcbdfab6d6a757c4cdc75b with SHA-1 588fa46c is in history

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

Change-Id: Ie369c374aaa78ef2ec394fa0af484bd6737e2ac7