[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: 937ffae447 -s ours am: 77ef4ed3cf -s ours

am skip reason: Merged-In I914766c7f155468a250afe5b8f42a16c57b1ea35 with SHA-1 3c15b686ed is already in history

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

Change-Id: Ife7242e6f35a3c51dbe40694e567ce096dfae8ee