Merge "Migrate Test Mapping" into udc-dev am: 386704d1 am: a3025975 am: 59989045 am: 79888a4b

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



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