Merge "Fix -Wfortify-source warning (2nd)" into main am: 8ebeb61a4b

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

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