Merge "Nullability check for wait module." am: e1df179f00 am: cea7551a27 am: 474b533f6a am: 9558e9485d

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

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