Merge "Store subscriber ID / IMSI into telephony database"
am: 1b17008fb9

Change-Id: I77aa0268387f45841037fd0e8805c18ab2dd4160