Merge "Revert "Re-enable and fix failing tests in...

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

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



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