Merge "Remove obsolete workaround." into main am: 4fa4354799 am: 9f0b15c8c5

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

Change-Id: Id69fcc7298b8fd074f47175ac7ca0ef9a93d8845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>