Merge changes from topic "am-8820c465c51b44949f4e1a80b5097183"

* changes:
  Merge changes from topic "am-bc40fdbdb974448fae6cea79ea66b3bd" into android12L-tests-dev am: eec4191010
  [automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours am: 7fad99971d -s ours am: b013f1698e -s ours am: ed828cfb2e -s ours