Merge "Revert "Add CTS test for Content Capture For Note API."" into udc-dev