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

Change-Id: I80f3c4b97fc9243df1a41f26f00fe1c37dc838e3