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

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

Change-Id: Iaf4377ed7488c4535b313fe15f8c159fe704899a