Merge "Clicking convo header launches notif settings" into rvc-qpr-dev am: a913e66236

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

Change-Id: Idce7b8020534985fd472a131d00448ddd547bb06