Merge "Fix nullptr dereference." am: bb81b77895

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

Change-Id: Idd6943263d1e6a8db79eda0823409397485045cd