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

Change-Id: Ia6de1dd98f791d0fd2f06abf00b3f933714b2075