[automerger skipped] Merge "Use flatten component name for Carrier Settings activity" am: 4ebb7ccadf am: ebf790fc0c
am: 371caedefa  -s ours

Change-Id: I4a8440705902f2e66fcfdd925d5f2b43e1f8de54