Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into...

Merge "Merge "Merge "vts_libsnapshot_test: Fix free space calculation." into android12-tests-dev am: abed76bf" into android12L-tests-dev am: 3a4b134e" am: 51d2d073 am: c8773801 am: 426f6ea2 am: fb5b83e8 am: 2a27e325

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2066968



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