- change password category title to Privacy and move Location into it. - remove Advanced security preference category - remove SIM card preference category and move the SIM card lock preferece down. - move Encryption and Credential settings to a separate screen. Bug: 34976707 Test: make RunSettingsRoboTests Change-Id: Iebaba4a8aad135fa88f163de0b60b488fd9510d0