Merge "Shrink notification history views to fit" into sc-qpr1-dev am: 2e16b4a07d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15846400

Change-Id: I3fe4948f72389c2b6e25adbb701f3ea8315d2340