Merge changes from topic "am-e6c556c6cc5a445da6801819c9445106"

* changes:
  Merge "[automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b8805786" into android12L-tests-dev am: 5141eaf3 -s ours" into android13-tests-dev am: 5658f346
  [automerger skipped] Merge "Merge "libsnapshot: Fix test failures on certain configurations." into android12-tests-dev am: b8805786" into android12L-tests-dev am: 5141eaf3 -s ours am: 51349daf -s ours