[automerger skipped] Re-enable UFFD GC for the February train, but with a different flag. am: c1f2365928 -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/+/20665667

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