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

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

Change-Id: I84837b7db98b53b4b1c0c8cd6633be6126675769