Merge "[locksettings] system_server should not call non forUser Settings.Secure.get* methods"