Merge "Update focus highlight of dialog button" into rvc-qpr-dev am: 8a0c9c3934 am: 34c79eab27

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

Change-Id: Ide73c3cd92a5f7af22fa147f8b3a5f9d63f7f33f