Merge "Merge "Update colors on action row." into rvc-dev am: 8ebd6996 am:...

Merge "Merge "Update colors on action row." into rvc-dev am: 8ebd6996 am: 9cb49d62 am: ff6177e4" into rvc-qpr-dev-plus-aosp am: 7b1c7890

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

Change-Id: If812ad2e5b6d40a1126616382c3fa693081d028e