Merge "Fix C++ deprecation warning." into main am: 77f3da22 am: 47aa9b50

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2937739



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