[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: e14a2a372a -s ours am: 2f808a6473 -s ours am: c1f10e93ca -s ours

am skip reason: Change-Id I34ff976dc284be9a84ad6c15a87a04af6d274391 with SHA-1 b4e563ca11 is in history

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

Change-Id: Id4eebf52343463fb7ab691c26b32e5378d260790