[automerger skipped] Merge "Add FUELGAUGE_ADVANCED_BATTERY_OPTION" into...

[automerger skipped] Merge "Add FUELGAUGE_ADVANCED_BATTERY_OPTION" into rvc-dev am: f097ce86 am: eaa7043d am: a5092889 am: 1d151c18 -s ours am: 314e1e6f -s ours

am skip reason: Change-Id Id65bba9a8b96c697ad56a01472648f132efa0e58 with SHA-1 93cbb37d is in history

Change-Id: I918f9528a248d99c4862d8fb5606a8559d382a3c