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

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



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