Merge "Ensure movement bounds for shift account for current bounds" into...

Merge "Ensure movement bounds for shift account for current bounds" into rvc-dev am: 8ffd77a2 am: d3106e2e am: db8e5412

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

Change-Id: I0b1fe1f3c15e9e5fabc9d802db6cf469f3817838