Merge "Add android.hardware.health@2.0 HAL"
am: b020127017

Change-Id: I0249412748434b22c1bbbd93a0d170d7e4c0a3e1