Merge "media: fix MediaMetadataRetriever Option Intdef" into main am: c1abb72141 am: e603518e05 am: eae7a31398 am: e3466ca1e7 am: 529664cc85

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

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