[automerger skipped] Store subscriber ID / IMSI into telephony database am: f92af313 -s ours
am: b3cd271b -s ours
am skip reason: change_id I64cd12a6737b7ef7fb31b851c1cbb5b7f46e6ca7 with SHA1 cdbf6a9b is in history
Change-Id: I1c6faa9d7aa9767e07b2ae3586e42b0fe867dd5c