Merge "Migrate Test mapping" into udc-dev am: 92fbfb20 am: 8a45255c am: 580cea79 am: e5b87f2b

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



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