[automerger skipped] Merge "Store subscriber ID / IMSI into telephony database" into qt-dev am: 75de2d5464 am: 0f6f48d0a2 -s ours
am: 6fb66ae6b2 -s ours
am skip reason: change_id Ia353d23cff698d973bd63ac59fd92dd0f2978317 with SHA1 3489b7cba1 is in history

Change-Id: If3958413c48e8a0a86711db11ba136f2a1655fdc