Merge changes from topic "am-0388fd5ce2ea437399b7e6e56a1d0b3b" into android12L-tests-dev

* changes:
  Merge changes from topic "am-eb1596016c134d95bd1524bcf156359f" into android12-tests-dev am: 9cdc967e20
  [automerger skipped] Merge "DO NOT MERGE Use explicitly opened file with O_WRONLY in test_sendfile_errno" into pie-cts-dev am: 9db3eee3c9 -s ours am: 4b942038d6 -s ours am: 2d063d54a4 -s ours am: 1f2e0b00cb -s ours