Merge "Revert "Re-enable and fix failing tests in NotificationStackScrollLayoutTest"" into udc-dev am: 5f870b38 am: 497f5ae1

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



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