Merge "Fix TestFormatter test for 2020a update [O-MR1 CTS]" into oreo-mr1-cts-dev am: e59b47ef82 am: 12e7fa1d7f am: da5eb09a6d am: 3f6d79c569 am: d6378f4723 am: 57b7674099 am: 0b12fd2201 am: 024d673055

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1298884

Change-Id: I08142b4f31bf3745ff6d71851dbd791bd78a7e95