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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibfd35ed1cbef962b7a6482c980e4856411daf54b