Merge "Allow --module and --test options  on retry if unset for previous session" into nougat-cts-dev
am: 9e533ad538

Change-Id: I09738cc260e290afa3f27bcd92ad36ed3b64155a