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

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



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