Merge "Set resizing to false if no fling animation" into sc-v2-dev am: 6366de23 am: bf931a7a

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

Change-Id: I71a6ddfe8736d7ba3da12b79f03ea20306fddee7