[automerger skipped] Merge Android R am: 01b19a9838 -s ours

am skip reason: Change-Id Icdac6de452cfb91db7fa31eb9f5633fd2372f22a with SHA-1 e14a2a372a is in history

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

Change-Id: Ie1b2dcf45319a8780901dcf95ec3577834c63a60