Merge "Update rotary highlight on bordered buttons" into rvc-qpr-dev am: 773641f5

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6570fc9f05fecc3ca529a06d5e28dadf63e0bdd9