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

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

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