Merge "Fix CDM dialog for accessibility" into tm-dev am: 23acf5a7 am: d2e16f8b

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



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