Merge "Fix null-deref crash while fuzzing" am: e435b1d759 am: eb7bdf9ac5 am: 2eb3839327

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2592309

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