Merge "Migrate Test Mapping" into udc-dev am: 386704d1 am: c9181a44 am: 654b2184 am: 5cc0e23a

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



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