[automerger skipped] am deca2a04: (-s ours) Merge "(DO NOT MERGE) Battery monitoring fixes:" into lmp-preview-dev am: f1f6fc8a09 -s ours

am skip reason: subject contains skip directive

Original change: undetermined

Change-Id: I8b101bf51e8b37d792374d7578bbbfbdfbd83a78