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

Change-Id: Id31d815995ac7929bd9d0a4e6c2b89ee457362f5