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

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



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