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

[automerger skipped] Check for malformed Sensor Flattenable am: 6d2f8c55 -s ours am: 317eb62d -s ours am: 5bea1385 -s ours am: 0e184fef -s ours am: 05f685f7 -s ours am: 2ac5ebce -s ours am: f53eb1ac -s ours am: 9dcc1812 -s ours am: 444cd8a5 -s ours

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

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



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