Merge "Add new fastbootd battery-soc variable" into main am: 06949876 am:...

Merge "Add new fastbootd battery-soc variable" into main am: 06949876 am: 7ec6046b am: adfb606f am: baa2ca87

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2774590



Change-Id: I5dc87c0ae42323d26a2945ee5f2f2a898889de47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>