[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 am: 90a8e326 am: 24af353d -s ours am: 983cdea2 -s ours

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

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

Change-Id: I3be18ee49c4a2a0050666fef569e4a8bc2b5998a