Merge "Remove nmusgrave@google.com from libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/OWNERS" into main