[automerger skipped] Check for malformed Sensor Flattenable am: f1aa5fb534 -s ours am: c8c2b5c765 -s ours am: c90ad2b776 -s ours am: 6e35e696f7 -s ours am: c975edc9a2 -s ours am: 0968c9202e -s ours

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

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

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