Merge "Disable nonnull in strace" am: fea41ef11a am: 94dd697d83 am: d7b559efc1 am: 8ffbb3ceef am: dd55bb5b4b

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

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