[automerger skipped] Merge "Fix -Wfortify-source warning (2nd)" into main am: 8ebeb61a am: 5ff8b6e5 -s ours

am skip reason: Merged-In If3ed05126c355e8790a666e62325fa1825a86b7b with SHA-1 cf05d7ac is already in history

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



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