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

Change-Id: I4e4a7da8f8b21c7bdfd5536d94433375431e9848