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

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



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