[automerger skipped] Merge "Prevent mEventCache UAF in SensorEventConnection" into rvc-dev am: 5adafe2d am: 81c8fe38 -s ours am: 21409c3c -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/+/12757250

Change-Id: If0efc6f2b30add846c909d6d511d2db30565022d