Merge changes from topic "revert-2709995-VVPYYBKIHY" into main am: 73a867a203

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

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