Merge "media: expose MediaFormat.KEY_HDR_STATIC_INFO key" into nyc-dev