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

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



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