Merge "Protect against misuse of an implementation detail." into main am: 4f9800aaeb am: 130b820e43

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

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