Merge "Use flatten component name for Carrier Settings activity"