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

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

Change-Id: I6fe52c0755cfc7a5e825d70de0fa28aa51e3b29e