Merge "Re-enable and fix failing tests in NotificationStackScrollLayoutTest" into udc-dev am: 149fed16 am: d6061dae am: 34873cbe am: 06fd311c

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



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