[automerger skipped] Merge "Open Conversation settings when tapping assoc header" into rvc-qpr-dev am: b742bfe901 am: bb4a70c627 -s ours
am skip reason: Change-Id I0919d06979fec3732146cc3286363eed443bb33d with SHA-1 727273bda4 is in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12685781
Change-Id: I0e8df482bc69cdf0fe9d4dfec4085ff95a10c357
This commit is contained in: