Merge "Change PiP stash scoring to distance moved" into tm-dev

libs/WindowManager/Shell/src/com/android/wm/shell/pip/tv/TvPipKeepClearAlgorithm.kt

@@ -416,7 +416,7 @@ class TvPipKeepClearAlgorithm(private val clock: () -> Long) {
         return stashCandidates.minByOrNull {
             val dx = abs(it.left - bounds.left)
             val dy = abs(it.top - bounds.top)
-            dx * bounds.height() + dy * bounds.width()
+            return@minByOrNull dx + dy
         }!!
     }