Merge "Fix Unlabeled NotificationStackScrollLayout on lock screen" into udc-dev am: 931a039b am: b09bf1dd

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



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