Merge "Remove AUTOFILL_TYPE_RICH_CONTENT and related code"