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

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

Change-Id: I897c01dac52d000ee6c7ca2b60c138c75b3f9d9b