[automerger skipped] Merge "Reduce screen layout in task override configuration from its parent config" am: 6e12301e84 am: e5424ec55b
am: f03be92220  -s ours

Change-Id: If60048af2d5f6929b64d04d59086860d90b77d18