Merge "Merge "Don't crash if media metadata isn't available" into rvc-dev am:...

Merge "Merge "Don't crash if media metadata isn't available" into rvc-dev am: b9bd2964 am: d4c533f6" into rvc-d1-dev-plus-aosp am: cadc083f am: d8d8ff47

Change-Id: Ie27650e260c25533430ba9c7e98d71dc0da2078d