Merge "Allow general errors for getImsiForApp()." into pi-dev
am: f3d1d3aed3

Change-Id: I8b5eee13e12d72e92fbdfa6cbea2597f086f3494