Merge "Notif History Visual Buff" into sc-dev am: 7f0888a6a0

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

Change-Id: Ibf16bc025602b7446e6631b485c4445f3df5761e