[automerger skipped] Merge "Store subscriber ID / IMSI into telephony database" am: 1b17008fb9
am: 18437cfbbe -s ours
am skip reason: change_id I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7 with SHA1 cf1ea8f868 is in history

Change-Id: I622b4cb6591ff6c4d4cb9e00323aee1099fed3ce