Merge "Fix accessibility regression." into rvc-dev am: e2714d739a

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

Change-Id: Ib2255d47af0f1a8d192117c741ff78c1bf022152