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

am: 5e389e354f  -s ours

Change-Id: I6e647a543ee4f934ce0b749996afe611e416705f
This commit is contained in:
Yifan Hong 2018-07-16 13:56:15 -07:00 committed by android-build-merger
commit ccb4af4996

Diff content is not available