Merge "Notification settings cog button ripple under notification" into sc-dev...

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

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

Change-Id: I9a206ab50863353c40048697d2604c2905278b4f