Merge "Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into...

Merge "Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into android15-tests-dev am: e4ffb7a9" into main am: 7a813fd3 am: 3cfc06cb

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



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