Merge "Add rotary highlight to switches" into rvc-qpr-dev am: c28fb42e29

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c85c22df09b85c1c7a051fa750014354923ba7c