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

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

Change-Id: Ibb73c3e907456da78b4a058b4360e9efc9b1a876