Merge "Fix overlayfs on page cf page agnostic builds." into main am: 0edd0412

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



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