Merge "Use flatten component name for Carrier Settings activity"
am: 4ebb7ccadf

Change-Id: I293944b64c4b6e008ba97a5b86f5480544179723