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

Change-Id: Idbcefb53c1c52e5def7a52c45fec539e3dccc619