Merge changes from topic "libril_soong" into main am: 070d655caf

Original change: https://android-review.googlesource.com/c/platform/hardware/ril/+/3283403

Change-Id: I29eca0ba3718a4d5be4638e27559863207d15796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>