Merge "Change PiP stash scoring to distance moved" into tm-dev am: 85c6db27a4

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17409445

Change-Id: I018a3dbd9923cbc45ebffc819f56ca6d8939e2b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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
         }!!
     }