Merge "Revert "Store subscriber ID / IMSI into telephony database"" into qt-dev
am: 1e3ee721c7

Change-Id: I25790c309045b662f904b2c25599930da868d6c4