Merge "libsnapshot: Fix MapAllSnapshotsWithoutSlotSwitch test" into android15-tests-dev