Merge "Fix NotificationTest on small screen." into udc-dev am: a21f721f6d am: 968e452d41

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

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