[automerger skipped] Merge "Fix that query format in getSubInfoForIccId is...
[automerger skipped] Merge "Fix that query format in getSubInfoForIccId is wrong." am: a559fb77 am: edea8235 -s ours
am skip reason: Change-Id Id75b6048bd9217ec7ddcfbd0ab2e6570a3f067cb with SHA-1 667617c5 is in history
Change-Id: I82c0f810bd77aa0cdf6820d53716261afefc20a6