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

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



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