[automerger skipped] Check for malformed Sensor Flattenable am: d1fe3644 am:...

[automerger skipped] Check for malformed Sensor Flattenable am: d1fe3644 am: e55af01f -s ours am: 8289851c -s ours am: e345ac6d -s ours am: 62d876d0 -s ours am: 1afa49ab -s ours

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

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



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