[automerger skipped] Merge "Add FUELGAUGE_ADVANCED_BATTERY_OPTION" into rvc-dev am: f097ce86 am: eaa7043d am: 5f17d7d9 am: 20875b01 -s ours
am skip reason: Change-Id Id65bba9a8b96c697ad56a01472648f132efa0e58 with SHA-1 30f31123 is in history
Change-Id: I8a77db57e31b6a98f7fb6ba364aa934d5bc3942e