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

Change-Id: I1f9b598d08321378c1e06cb00e5647369df9de66