Merge "fs_mgr_overlayfs: Trim surrounding "@" from the per mountpoint scratch...

Merge "fs_mgr_overlayfs: Trim surrounding "@" from the per mountpoint scratch dir name" into main am: e746bc44 am: cceb560b

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



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