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

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



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