am e86420e3: (-s ours) Merge "Fix flattening/unflattening of android::Sensor."

* commit 'e86420e399993e0f49e5d7733b5fc87eb9fe179b':
  Fix flattening/unflattening of android::Sensor.