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

Change-Id: I08cd17e4e1d461998159607cd7f4eae17ce9e399