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

Change-Id: I317e14393466df72f51dc7beb01f04671926640a