Merge "Correctly update sensor status in restricted mode" into qt-dev
am: e84ab77823

Change-Id: Iec03e5acda1a6d105884b9318229c22c0b680ef0