Merge "Hide SIP pii data from logs in SipService. am: 226ac3ad92 am: 3081e5a8b6" into nyc-mr1-dev-plus-aosp