Merge changes I335dc3bd,I8bc10d23 into video-userspace.lnx.5.0

* changes:
  mm-video-v4l2: New extradata for hdr10 plus metadata
  media: Update consumer usage bit for HEIC