Merge "Fix AudioFocusWithVdmTest CTS" into udc-dev