[automerger skipped] Merge "Store subscriber ID / IMSI into telephony database" into qt-dev am: 408704dfea -s ours
am: afba51dd7e -s ours
am skip reason: change_id I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7 with SHA1 4e97d2c105 is in history

Change-Id: I00a6a9c6efbfb83f59969ba193d3fd43c8623a73