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

Change-Id: I6c638352b938bd25895d237aa7d8f651d89925ec