Merge "Fix null deref in sensors 2.0 VTS teardown am: b6b28e58c4 am: 6e4370b5b6" into qt-r1-dev-plus-aosp