[automerger skipped] Merge "update carrier id when esim downloaded" am: 2fde7b70
am: 924fb545 -s ours
am skip reason: change_id I092832b66827b15dd937cd7884a7a94d8c3e0f74 with SHA1 c8ade6db is in history
Change-Id: I5c273bb7bb83851edf0a6d09b4c11f3e326d749d