Merge "Misc fix on top level items."

    <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->

    <string name="account_settings_title">Accounts</string>

    <!-- Main Settings screen setting option title for the item to take you to the security screen -->

    <string name="security_settings_title">Security</string>

    <string name="security_settings_title">Security &amp; lockscreen</string>

    <!-- Main Settings screen setting option summary text for the item tot ake you to the security and location screen -->

    <string name="security_settings_summary">Set My Location, screen unlock, SIM card lock, credential storage lock</string>

    <!-- Main Settings screen setting option summary text for the item to take you to the CDMA security and location screen -->