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

Change-Id: Ib0b9720f7eb27f48f85f25c47b8e20effd146dd0