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

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

Change-Id: I1300a12a963b8ab058a8b6da8bd7b7c43370c281