Android Mainline 12.0.0 Release 98 (8303336,com.google.android.art)
Merge remote-tracking branch 'aosp/upstream-master' into aosp am: a3965e992f

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/f2fs-tools/+/14818169

Change-Id: I4d4a6fffb0249b781924818430242f064a488825