[automerger skipped] Merge "Support fastboot variable battery-soc-ok" am: e06850afdb am: b003fa556c
am: bae0289d1c  -s ours

Change-Id: I80464ee6f3193b531fa4c6c64a6dddbf8ef983c6