Merge "Only allow mediaserver to report video battery stats" into qt-qpr1-dev
am: 166eee1f33

Change-Id: Ica5b02437acb54d36069d4c3c31d3e1200ef1f88