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

Merge "Migrate Test mapping" into udc-dev am: c141f6af am: ae267e3d am: 382f6161 am: 8dc19255

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



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