Merge "WM: Fix DisplayCutout computation in WindowState.computeFrameLw"