Merge "Update VDM implementation due to vitual_camera aidl changes" into main