Revert "Revert "Workaround bogus TreeMap Comparators.""

An app that is popular among testers is still broken.
This CL re-establishes the work-around to give the
app a little bit of time to update their dependencies
to the fixed versions.

This reverts commit 3733bc93.

By reverting that revert, this CL re-applies the changes from
commit 78562a12

*** THIS CHANGE IS TEMPORARY AND WILL LIKELY BE ***
*** REVERTED BEFORE THE NEXT ANDROID RELEASE    ***

Test: cts-tradefed run cts -m CtsLibcoreTestCases -a arm64-v8a
Test: these tests from guava-testlib 21.0-rc2's TestsForMapsInJavaUtil:
      - testsForTreeMapNatural()
      - testsForTreeMapWithComparator()

Bug: 34084348

Change-Id: I3d120f00bf5a14e89cf3d50c3931557191aa5f37