Merge "Clean up UserHandle.isOwner() in settings"