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

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



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