Merge "Make sure modules aren't marked done on retry-type custom" into nougat-cts-dev am: 6a8957d215 am: 725e8de2d3 am: 4571f6bb18 am: 6409a5a2bb
am: db926b4ef2

Change-Id: I8db91efae4535e4e401aeb49fbc32e9126924e61