[automerger skipped] Fix assumptions in SensorsHidlTest.NoStaleEvents am: bf23abb745 -s ours am: ab701a4131 -s ours am: 9dde733ae9 -s ours
am: dad4e24ea7 -s ours
am skip reason: change_id I83f0cb2f6e878244f3d94ae77f64bb8ed2f78e0b with SHA1 d8b212ec3e is in history

Change-Id: I87f9ad45047b3b8fc91d654bc8b44b771d467b30