Merge "Migrate Test mapping" into udc-dev am: c141f6af am: 94c26bed am: a17f01e9 am: ee7484b4

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



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