Merge "Don't use a scrollable dialog for CastDialog" into tm-dev am:...

Merge "Don't use a scrollable dialog for CastDialog" into tm-dev am: ea9f1bc8 am: 656aca00 am: a337597b am: 1fde40dd

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



Change-Id: I179f2df81f0dcc7d1f046f7b899bafe385ce2da8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>