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

Change-Id: Ie87be940edcb8d24903e40e22b37927896f1b6d1