[automerger skipped] Check for malformed Sensor Flattenable am: d1fe364455 am: e55af01f2f -s ours am: 8289851cfb -s ours am: e345ac6dc5 -s ours

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

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

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