[automerger skipped] Merge "Store subscriber ID / IMSI into telephony database" into qt-dev
am: 924aea973d -s ours
am skip reason: change_id I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7 with SHA1 f92af313a5 is in history

Change-Id: Ic499bb7879627c898539285650140592429bb0e1