Merge "Minor improvements on a11y and instrumentation classes:" into udc-dev...

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

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



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