Merge "Migrate Test mapping" into udc-dev am: c141f6af am: ae267e3d

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



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