Merge "fortify_test.cpp: _FORTIFY_SOURCE=3 should be a superset of 2." into main am: 1669ab022b

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

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