[automerger skipped] Merge "libbatterymonitor: vendor_available"
am: 895acebe94  -s ours

Change-Id: If9cbc457e901f94318daf414d9cc3377e929f2e1