Merge "fs_mgr_overlayfs: Setup remount scratch dir with encoded mountpoint...

Merge "fs_mgr_overlayfs: Setup remount scratch dir with encoded mountpoint name" into main am: aba8c1ee am: 54761ef4 am: 5f3e13dd

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



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