[automerger skipped] Allow general errors for getImsiForApp(). am: 1f3d0a68a4  -s ours
am: 0b8846e5bb  -s ours

Change-Id: I333e671358a4089d843aaf2d06b0d6d5084e9c10