Merge "Fix and reenable fuzzer." am: 5c3748e776 am: e58c2c57e8

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1349125

Change-Id: Ibaf980e04bfceaa05255b4564a9f9676a4e0a4b9