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

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



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