Merge changes from topic "am-558ef604bf3c4c1c8ddefc69ffec2c23"
* changes:
Merge "DO NOT MERGE: libsnapshot: Fix test failures on certain configurations." into android13-tests-dev am: 1264f394
[automerger skipped] DO NOT MERGE: libsnapshot: Fix test failures on certain configurations. am: 3f96053b -s ours