[automerger skipped] Merge "DO NOT MERGE Use round highlight for navigation buttons" into rvc-qpr-dev am: 99fe8f30 am: a5a6764e -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6009c80c62b56072167486b1a8dc2cf4d9c0cb3f