[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891 am: e5d4712ba2 -s ours am: 3d7419b262 -s ours

am skip reason: Merged-In Ie1caad9ffcd8ac9e2544b627ad85966178dc00a1 with SHA-1 6f309fc246 is already in history

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

Change-Id: I4ecbc84dc2e86afaa8fdf13fa401e3031796ebea