Merge "Update MockTelephonyManager to align with the method being overriden" into main