[automerger skipped] Merge "Remove trailing 'F's in IccId when quering sub...
[automerger skipped] Merge "Remove trailing 'F's in IccId when quering sub database with it" am: e08ec8af am: 6e501965 -s ours
am skip reason: Change-Id I1d9a00a3a9ff3648c9e32b3b5343698a3dc92072 with SHA-1 7e5f3da2 is in history
Change-Id: Ie7da3a3f2e552393d0bc7938164fd9c29c5bdb78