Merge "Fix new adb remount/overlayfs solution for older kernels" into main am:...

Merge "Fix new adb remount/overlayfs solution for older kernels" into main am: c8b78c70 am: bb1a8d2a

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



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