Merge "b/5309787 Add new columns to hidden list of read only fields" into ics-mr1