Merge "Improve visual debugging for NotificationStackScrollLayout" into sc-v2-dev am: 532102525f

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

Change-Id: I2ae0bec9401914d00fd2d23d0d74234c231856bd