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

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



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