Merge "Migrate Test Mapping" into udc-dev am: ee3c9ef1 am: 9f06d55e am: 2ecb2925 am: f70312b4

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



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