Merge "Nullability check for if module." am: 8e5e8ee14b

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

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