[automerger skipped] Merge "Fix that query format in getSubInfoForIccId is wrong." am: a559fb77 am: edea8235 -s ours am: 94fb2f98 -s ours am: 7a057287 -s ours am: 0f878584 -s ours

am skip reason: Change-Id Id75b6048bd9217ec7ddcfbd0ab2e6570a3f067cb with SHA-1 667617c5 is in history

Change-Id: I38b5c66ed6a52b8e9f69c6315887abfa41437ce7