Merge "Mark auto-disabled sensor as not active" into qt-dev am: f5a44ae2e0
am: ebdd3d5056

Change-Id: Ib12ac99d51d3ce72235dbc7864797300c305c685