Merge changes from topic "charger_soong" am: 333149339b

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

Change-Id: I74f8883963fa06d4000694b037117d7298897370