Merge "Disable nonnull in strace" am: fea41ef11a am: 94dd697d83

Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2513458

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