Merge "Fix AIDL sensors VTS test" into tm-dev