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: 78683719 am: cacd8515

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

Change-Id: I31845257c7975a48d996b2310044530cbaf62479