Merge "Migrate Test Mapping" into udc-dev am: ee3c9ef1 am: 9f06d55e

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



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