Merge "Fix null pointer exception in TelephonyConnection" into rvc-dev