Merge "Update the TEST_MAPPING files on AOSP (framework/av)" am: 46285b89f9 am: b66c835bb0

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

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