Merge "Jarjar frameworks/libs/net in telephony module" am: 4bae9375 am:...

Merge "Jarjar frameworks/libs/net in telephony module" am: 4bae9375 am: f0e6b922 am: 267d19bd am: 21967765

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

Change-Id: Ibeeeb43a8631189d885d46b0294f76238fadd78f