Merge "Replace use of overlayfs' override_creds with overlay_remounter" into...

Merge "Replace use of overlayfs' override_creds with overlay_remounter" into main am: b5402e7e am: c3e6b888

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



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