Merge "[CDM] Explicitly annotate secure transport disabling API as @TestApi" into main