Merge "Fix PIP snapping to incorrect location." into rvc-dev am: 6ad0b48b0a am: 10d08b392b

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

Change-Id: I2e085661dfa328fcb8e7eccb8e944b3ae87ffd81