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