Merge "Introduce unit tests for non-public VirtualDisplayConfig APIs" into udc-dev