[automerger skipped] Merge "Expose Registration Failures in PhoneStateListener" am: 1f3b55fa am: c4fb02b3 am: 59d0c377 -s ours
am skip reason: Change-Id Ic10d798b1334fa3ce6742a25662b0148c62321d6 with SHA-1 1d8f87c5 is in history
Change-Id: If49ee10869445d7a19d81f8f8f006b5744b6f88f