Merge "Make sure modules aren't marked done on retry-type custom" into nougat-cts-dev