[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 79fa4b3041 -s ours am: e2bc550efc -s ours

am skip reason: Merged-In If8e7edf2206a6d01d96b89a8e3f9c1396a282776 with SHA-1 f59248c348 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/sm8150/data/ipacfg-mgr/+/15571771

Change-Id: I81d3536122c239e9cc206560a0da9fb46a31bfbd