Merge "SF: Remove unused SurfaceFlinger::getLayerSortedByZForHwcDisplay"