Merge "Annotate CDD requirment tests" into stage-aosp-tm-ts-dev