DO NOT MERGE Fix CTS not executed count

Effectively cherrypick ag/1371761 into dr1 after abandoning merge
conflict at ag/1392068.

bug:30960276
Change-Id: If3c9bb9d4c478998a166e239cfc7199049ee9c1a
8 files changed