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: f02c44f6 am: 90ff4f35 am: 77a4a40e

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

Change-Id: I2dd2c4b439e1824b5ca0c24e52e3cf479fdeb05e