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

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

Change-Id: Ic827b458bbebce4f024e99d6fc5e0801e5b443e1