Merge "Migrate Test mapping" into udc-dev am: c141f6af am: ae267e3d am: ed4e8ab6 am: 41a84d92

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



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