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 am: d28b728b am: 23a940fa

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



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