Merge "Migrate Test mapping" into udc-dev am: c141f6af am: 94c26bed

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



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