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

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

Change-Id: I77fe28f84243d13f31b53a83ae96def2f750517b