Merge "Fix null-deref crash while fuzzing" am: e435b1d7 am: eb7bdf9a am:...

Merge "Fix null-deref crash while fuzzing" am: e435b1d7 am: eb7bdf9a am: 2eb38393 am: 211b20e0

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



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