Merge "Migrate Test mapping" into udc-dev am: 38f74691 am: 93917695 am:...

Merge "Migrate Test mapping" into udc-dev am: 38f74691 am: 93917695 am: 6c73ed2a am: 7ec58364

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



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