Merge "Merge "Fix sensor triggering issue" into qt-r1-dev am: fba4296329 am: a740635d8a" into qt-qpr1-dev-plus-aosp
am: 5693cd90ee

Change-Id: I8d5171f9d65a8472ae50d68a5c63183178340ac2