Merge "Revert "Add tests for AppCompat gated changes."" into rvc-dev