Merge changes from topic "sensorservice_fuzzer" am: a87bb3c945 am: fca46f6241

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

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