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

Change-Id: I51173ccb24f070c3ff1c7cea67f83e856ca78339