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

Change-Id: I0f4966f697243fb785eed874927efa832e3083e1