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

Change-Id: Iee3e215f4bb89276b26ac00e845d78caa7ec9234