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

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



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