Merge "Fix anonymous class error" into main am: 44b0e7a725 am: af9c5273e5

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

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