Merge "Handle null media metadata" into rvc-qpr-dev am: 4c438e2082

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

Change-Id: I3a55463182c949b46a1e0c481917ea7d634197f4