Merge "Fix uses of the deprecated API level names in the implementation." into main am: 021dd1c614

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

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