[automerger] Merge "Allow general errors for getImsiForApp()." into pi-dev am: f3d1d3aed3 am: 7841e0c292

Change-Id: If873c6fb4243a14a399c35a96d843e492bb2c0f0