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

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1164119

Change-Id: I0be678a9298669f934a0a8fb95ba57944c8228a1