Merge "Migrate TelephonyManagerShimImpl to new CPCallback interface" am: 07978fe5a5

Original change: https://android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/2029525

Change-Id: I906f193d3d2a0b0fdef3a71023d56291b1f7b007