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

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



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