Merge "Merge "Add debug logging to StackScrollAlgorithm" into tm-dev am: 55f43e04 am: 21dee3fd am: 7bb4ac3e" into tm-qpr-dev-plus-aosp am: 0c3c097a

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



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