Merge "Fix sensor activate after SensorEventConnection removed" am: b51a9cc926 am: ce93621d5d am: 5673d11d4a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib6f828cf2d9f30e2250279e1b93ae557ca041639