Merge "Merge "copy auto-group decisions to updates" into nyc-dev am: facdf19313 am: 963b1da018" into nyc-mr1-dev-plus-aosp