Merge "Reduce flakiness by allowing multiple scans - even if empty" into stage-aosp-sc-v2-ts-dev