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

Change-Id: I436f6d0fba32a15ec2925277d5a3d59230654936