Merge "Migrate Test mapping" into udc-dev am: cd1a8f90 am: 8e735144 am: e2e071b0 am: 3d290b99

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



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