Merge "Migrate MediaMetadataRetrieverTest to JUnit4" into main am: 7e44fa6c44 am: 7dd5e4df65 am: 7c9d7fbc67

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2788712

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