Revert UriMatcher hamcrest changes.#2312

copybara-service[bot] merged 1 commit intomainandroid/android-test:mainfrom

piper_698119468android/android-test:piper_698119468Copy head branch name to clipboard