Android Mainline 12.0.0 Release 52 (7983414,com.google.android.resolv)
Merge tag 'v1.2.1' into update am: 7269cd8246 am: 8fe4f5452d am: 9c9ce2caf4 am: b4b786ca61

Original change: https://android-review.googlesource.com/c/platform/external/erofs-utils/+/1703646

Change-Id: I032949d2e2d8beb086a62e4dfdf789f7fb3d6eb5