[automerger skipped] Check for malformed Sensor Flattenable am: f1aa5fb5 -s...

[automerger skipped] Check for malformed Sensor Flattenable am: f1aa5fb5 -s ours am: c8c2b5c7 -s ours am: c90ad2b7 -s ours am: 6e35e696 -s ours am: c975edc9 -s ours am: 0968c920 -s ours am: 1c979aba -s ours am: ffb8646e -s ours am: 641776b2 -s ours

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

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



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