Merge "Don't set expansion for downward (upward) scroll when the bouncer is...

Merge "Don't set expansion for downward (upward) scroll when the bouncer is hidden (shown)." into tm-dev am: 81a5f75d am: 52562fdc am: 0e6dd9ea

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



Change-Id: I616b70c93a51364d1bc3e7cdb0fd2ed963a48d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>