Merge "Revert "Enable @TestApi access for instrumentation."" into sc-dev