[automerger skipped] Merge "Fix assumptions in SensorsHidlTest.NoStaleEvents" into qt-dev
am: 0436097a3f -s ours
am skip reason: change_id I83f0cb2f6e878244f3d94ae77f64bb8ed2f78e0b with SHA1 bf23abb745 is in history

Change-Id: I1be68986221b0dcc239b319c2ad63b361d2aaaa1