Merge "Treat SENSOR_DIRTY as user not detected" into qt-r1-dev am: a4a02a7854 am: e94953ad69
am: 322bc7e5ab

Change-Id: I4d6851495b5ec09f89c83ba6156ef7b762b8fcf0