[automerger skipped] SubId is not included in extra for carrier config change intent for SIM2
am: a0f6e90c0f -s ours
am skip reason: change_id I97c734a38dc8b37cc4996862d696351063fafd58 with SHA1 e7de61b459 is in history

Change-Id: I2e2896764dfa70247d435864b406d7911335cd02