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

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

Change-Id: Ibb7fd0b089e4d948a730ec09b166beba40aacb69