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

Merge "Update the TEST_MAPPING files on AOSP (framework/av)" am: 46285b89 am: b66c835b am: c29cee7d am: 5617a1da

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



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