[automerger skipped] Merge "Improve Cast dialog styles" into tm-dev am:...

[automerger skipped] Merge "Improve Cast dialog styles" into tm-dev am: 24637529 am: 0f98c5c2 -s ours

am skip reason: Merged-In Ic20df867177986a6a73617dd9141e4d091651b5b with SHA-1 b587411e is already in history

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

Change-Id: If17cf75ac8117d79fca485c8ceff4062e9ada64c