Merge "setDone for module only when module isn't already done" into nougat-cts-dev