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

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



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