Merge "Handle missing contact permission for preferred SIM" am: f765d94d1c am: 196a7943be
am: 488ba68c75

Change-Id: Idabf22fc4d16e3c00464f8f4acbe9900eb645f14