Merge "Add FUELGAUGE_ADVANCED_BATTERY_OPTION" into rvc-dev