Merge "Revert "Store subscriber ID / IMSI into telephony database"" into qt-dev