Merge "Notification settings cog button ripple under notification" into sc-dev am: 5a7bd275

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

Change-Id: Ic75a9deb5f04310664d73bb651d3916567edafc4