Merge "Re-enable and fix failing tests in NotificationStackScrollLayoutTest" into udc-dev am: 149fed16 am: 5376d558 am: c01bd170 am: 64f922b4

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



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