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

Change-Id: I2516b9132982104ef870d79a7c63c7d002f036de