[automerger skipped] DO NOT MERGE Use round highlight for navigation buttons am: 9242e6ee am: bde54603 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ib3e9cb3472a282afe8c98c0f0ef935be30ab7fb4