Merge changes from topic "danielnorman-a11y-owners" am: de7d3fb6 am: 41b4e4d9

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



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