[automerger skipped] Merge "Fix TestFormatter test for 2020a update [O CTS]" into oreo-cts-dev am: cf3f518256 am: 6b54543480 am: 20466552a7 -s ours am: 4f7074ca17 -s ours am: aed21e1d8f -s ours

am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 044bd5e685 is in history

Change-Id: If6781ede138af54a9b47e7322d39ac19b14ee167