Prevent NPE in Contacts when subId is null

Change-Id: I68f9f1be0b60b6d555f158d6cc37ed2b72b9ac2b
Merge branch 'remote' into mkl