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

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

Change-Id: I81c1681c2d462689a243ddc2b2f21e9e933ef9fd