Merge "camera: Fix AIDL VTS test" into tm-dev