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

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

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