Merge "Add ADAPTIVE_BATTERY_MANAGEMENT_ENABLED" into pi-dev
am: 4620d9b3a3

Change-Id: I4890f4b4e1f8dbcf144b2e613165382d67b70de3