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

Change-Id: Ie19afc9105b93b0856f52be670598ab1974fa72b