[automerger skipped] Merge "Change the title when in call/media state" into pi-dev am: 32adc82c8a
am: 44526c44ca  -s ours

Change-Id: I464549ce35281bcb57e15fddacf2d21ee83b1d66