Merge changes I0a880124,I2e5c3e7f

* changes:
  Include the TV Input Service uid in metrics logging.
  Add TifTuneStateChanged atom.