[automerger skipped] Merge "Jarjar frameworks/libs/net in telephony module"...

[automerger skipped] Merge "Jarjar frameworks/libs/net in telephony module" into rvc-dev am: 48f424f0 -s ours am: af1e62b9 -s ours

am skip reason: Change-Id Iddd4a1b44dc84b3ed3976b219ef66b2d1a2ca862 with SHA-1 18864b82 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/11835356

Change-Id: I90b9b03cc3daa7d309d8b45fd2922b31de36a261