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

Merge "Handle with the nonnull case in a tricky way" am: 1c324d35 am: c69c4b51 am: ac1477c9 am: 00b47f18 am: b5ec5730

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



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