Merge "Merge "setDone for module only when module isn't already done" into nougat-cts-dev am: 0577f4b8e1" into nougat-mr1-cts-dev am: 93dd3c3c1c am: 0618559c51 am: 42d06fe3bf
am: 23174abd0c

Change-Id: Iff12c76160ec8674329c848cf19390b18b821f62