Merge "Migrate Test mapping" into udc-dev am: 38f74691 am: 9ba197a4

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



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