Merge "Migrate Test Mapping" into udc-dev am: ee3c9ef1 am: bee77d7a am: 5d54f182 am: 0979f475

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



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