Merge "Add the relative address when DisplayDeviceInfo gets copied between SurfaceFlinger and SurfaceComposer."