Merge "Don't move PiP towards a corner after user manually moved it." into...

Merge "Don't move PiP towards a corner after user manually moved it." into tm-qpr-dev am: 77f5aecb am: deaf5a19

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



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