Merge "Update locksettings OWNERS"