Merge "Fix that query format in getSubInfoForIccId is wrong." into rvc-dev am:...
Merge "Fix that query format in getSubInfoForIccId is wrong." into rvc-dev am: 764c0320 am: 771a3232 am: 0b5c24f9 am: e88a98d9
Change-Id: I19055ffbe53a504fc8f3ab6777643b094b9ab9c6