Merge "Migrate Test mapping" into udc-dev am: 92fbfb20 am: f076d17c am: d356e8be am: 224c1755

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



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