Merge "Fix 3201870: Move OwnerInfo settings to Location&Security."