Merge "Add android.hardware.health@2.0 HAL" am: b020127017 am: 4aceac6a8d
am: 1c90ab9f16

Change-Id: I4b47c462f392f774a2108f91a915584176ab71e9