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

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

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