Merge "Minor improvements on a11y and instrumentation classes:" into udc-dev am: 7a7583ca

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



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