Merge "Handle with the nonnull case in a tricky way" am: 1c324d35

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2518595



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