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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4048b194e27fc11a81e184857fc3b92d15b9233e