Merge "SubId is not included in extra for carrier config change intent for SIM2"
am: 7d38fa497b

Change-Id: Ia2bf04748c188125a1a389bae57367050a18aa46