Merge "Migrate Test mapping" into udc-dev am: cd1a8f90

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



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