Merge "second-stage-init: Don't move submounts when mounting overlayfs" into...

Merge "second-stage-init: Don't move submounts when mounting overlayfs" into main am: 475599f5 am: 8fac7db7

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



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