[automerger skipped] Merge "Fix assumptions in SensorsHidlTest.NoStaleEvents"...
[automerger skipped] Merge "Fix assumptions in SensorsHidlTest.NoStaleEvents" into qt-dev am: 0436097a -s ours
am: 75c50faa -s ours
am skip reason: change_id I83f0cb2f6e878244f3d94ae77f64bb8ed2f78e0b with SHA1 bf23abb7 is in history
Change-Id: Id2571f67c19170928aa5a33b8e47160943567ded