Merge changes from topic "am-eb1596016c134d95bd1524bcf156359f" into android12-tests-dev

* changes:
  Merge changes from topic "am-4583345af0084601af93ecdceb3a2cc7" into android11-tests-dev am: 8a9954046b
  [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