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

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

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



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