Merge commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c' * commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c': Add SipAddress to ContactsContract.
Merge commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c' * commit 'b4298cd8ba48db21625a396311e01ed6ad9f516c': Add SipAddress to ContactsContract.