Merge "Merge "Update focus highlight of car dialog button" into rvc-dev am:...

Merge "Merge "Update focus highlight of car dialog button" into rvc-dev am: 333f7c95 am: 88951317 am: cf9faaff" into rvc-qpr-dev-plus-aosp am: a381467a

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

Change-Id: I4dcf827298e4b66772054e8a3579e2dacf4f7c64