Merge "Migrate Test mapping" into udc-dev am: 15780e67 am: bf086d71

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



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