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

Change-Id: I8ad754776b5d70f59b28d76f60b8452a59d40074