[automerger skipped] Check for malformed Sensor Flattenable am: 9170e60bf6 -s ours am: e6d5ee9928 -s ours am: 8914ea5bda -s ours am: cf5e376368 -s ours

am skip reason: Merged-In I0e255c64243c38876fb657cbf942fc1613363216 with SHA-1 d1fe364455 is already in history

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

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