Merge "Fix TestFormatter test for 2020a update [O CTS]" into oreo-cts-dev