Merge "Update Clipboard Test to reflect new CDD language" into stage-aosp-tm-ts-dev