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 am: b49b1d31

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

Change-Id: I22ad90919ec122c65b70b8e6159c1dddb641c061