Merge "Merge "Make sure modules aren't marked done on retry-type custom" into nougat-cts-dev am: 6a8957d215" into nougat-mr1-cts-dev am: c46afb068c am: 79e1a1f2e5 am: 7c8c5d6fb9 am: f3d98dac67
am: 01fb9a0eb1

Change-Id: If90c5e85fcf97e5f3cb7e91e199e84ffc9f855a3