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

Change-Id: I6a1375a79e57c03b737f284c3f213a49910ae31c