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 am: c715e8d0

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

Change-Id: Ibd2a766c62bade6e45dc803abd4d44b7988672ff