[automerger skipped] Store subscriber ID / IMSI into telephony database am: 67e41897
am: d9f59883 -s ours
am skip reason: change_id Ia353d23cff698d973bd63ac59fd92dd0f2978317 with SHA1 67e41897 is in history
Change-Id: Ice197bcfba8f144872ff63d8ce9a374f91d18ac5