Merge "Merge "Update the style of navigation button" into rvc-dev am:...

Merge "Merge "Update the style of navigation button" into rvc-dev am: b5ec9c4d am: 79246a06" into rvc-d1-dev-plus-aosp am: f198ea80

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

Change-Id: Ic57deaa966299583e2cc9fef24424ae9ba70b32d