Merge "health@2.0: IHealthInfoCallback expands HealthInfo struct."
am: f2f00cb742

Change-Id: Iad21de674c7dc04a19727adc81ff931923e93e4a