[automerger skipped] Switch to the final flag for the March train. am: 0770a41f34 -s ours

am skip reason: Merged-In I163f808399eb27393e00dbb149d5941ff3db277f with SHA-1 60e0a00cbf is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/art/+/20665668

Change-Id: I3b8c201b3af68da4d55c1f1cca9bec9415627d80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>