Merge changes from topic "am-243d83f2e1834512a5f6c07cae7c3ce2" into android12-tests-dev

* changes:
  Merge "[automerger skipped] Merge "Fix Bionic dlfcn.dladdr_libc test case for 64bit binary translations" into android10-tests-dev am: 3382f346fc -s ours" into android11-tests-dev am: 98b842fce6
  [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