[automerger skipped] Merge Android 12 am: 3106a02196 -s ours am: 3879ed119d -s ours

am skip reason: Merged-In Iec734ba978828f123e524782bf4bce971ccfaede with SHA-1 79fa4b3041 is already in history

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

Change-Id: I0001f314c88710ad3f43df6e371f5279c0eb14d9