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