[automerger skipped] Merge "Prevent mEventCache UAF in SensorEventConnection"...

[automerger skipped] Merge "Prevent mEventCache UAF in SensorEventConnection" into qt-qpr1-dev am: 6141137f -s ours am: 0dbd4cf3 -s ours

am skip reason: Change-Id Ia9275b7cc574df371cdb2e1b80c6699df193b580 with SHA-1 f1bf7dd0 is in history

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

Change-Id: I9286f12f4bbb561ae426490cc27838b6e9fda6fe