Merge "Add new fastbootd battery-soc variable" into main