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

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

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