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

Change-Id: Ief805f71a0af43b7f1aa3acc68a24d98a6157186