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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I84a1bcf390366d45792a974256a61b82291d0100