Merge changes from topic "am-6109f81bfb984ecaa06f3f826ebeee7d"

* changes:
  [automerger skipped] Merge "Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c" into android13-tests-dev am: 0412ff9c1e -s ours
  [automerger skipped] Merge "libsnapshot: Use SnapshotManager to delete devices." into android12L-tests-dev am: 11caad9d6c am: 4fc18600ac -s ours