Merge "Revert "Add new network quirk parcelable in the NetworkAttributes.""