[automerger skipped] Merge "Fix TestFormatter test for 2020a update [O CTS]" into oreo-cts-dev am: cf3f518256 -s ours

am skip reason: Change-Id If6a2dbb615a70739350cbae91cc33754afe2b793 with SHA-1 632b97783e is in history

Change-Id: I8da5e3bd62b091d1cde97413d836c3753a2f2fef