Merge "DO NOT MERGE Use round highlight for navigation buttons" into rvc-qpr-dev am: 99fe8f30

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

Change-Id: I8b3595974025bcef8e81ace0c8f0f441659c8f32