[automerger skipped] Merge "Store subscriber ID / IMSI into telephony database" am: 4271afa8
am: adc59877 -s ours
am skip reason: change_id I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7 with SHA1 f92af313 is in history
Change-Id: I6ec5f1f4e3dcbeda9ef1a2ae8876ef65444f4a0a