Merge "Add subId extra to CARRIER_CONFIG broadcast only when relevant."
am: de067d0987

Change-Id: I7829ca08c7e7c83ffbdc0525d26f156a76005e15