Merge "update AIDL IGoogleBattery manifest version to 2" into tm-qpr-dev