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

Change-Id: Ib76838cdfd3cf238cf0dc5bf1163249b0f15e6be