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: Id787a8b926cb5efdbdba91186135b5fd28fda743