Merge changes Ie107b57d,I315fe1b4 into main

* changes:
  Freeze android.hardware.tv.media
  Remove owner field from android.hardware.tv.mediaquality