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

Change-Id: I14fae1af58eef7497aa9cadee3dde6a9044d014f