Merge "Fix dialog accessibility issues." into sc-v2-dev am: 65ce0da897

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

Change-Id: I8725e95c208ca3409897f456f7274f3a992df10c