[automerger skipped] Merge "Store subscriber ID / IMSI into telephony database" am: cf5e620a19
am: 98969328f2 -s ours
am skip reason: change_id I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7 with SHA1 a120f95d26 is in history

Change-Id: I4e2d86d23c3205a8437debca8f536d7b89e27b82