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: e218d32f

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



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