[automerger skipped] Merge "Handle IllegalStateException from TelephonyManager." into qt-qpr1-dev am: cefa4768 -s ours
am skip reason: Change-Id I49f632243704ba08a106867c58573e5631dda5d6 with SHA-1 05feeb18 is in history
Change-Id: I7bdab270eaee42bc1e83b126511eb647e0e50c04