Merge "Preference SimSettingsActivity not aligned correctly"
am: 8d3d166823

Change-Id: I67a977b974ddbf42b01647e4ca02d7d9dfe1b61d