Merge "media: fix MediaMetadataRetriever Option Intdef" into main am: c1abb72141

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

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