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

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

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