Merge "Remove reference to a hidden method from CTS." into stage-aosp-tm-ts-dev