Merge "Add HIDDEN_API_POLICY to @TestApi.i"