Merge "Update method isSmartBatteryEnabled()" into pi-dev
am: 3feb2f87ff

Change-Id: Ia4a5ca96a43eb4b9c2ad03f1f89c3bb4e6dfa632