Merge "Merge "Add entry point for conversation settings" into rvc-dev am:...

Merge "Merge "Add entry point for conversation settings" into rvc-dev am: 613e3c40 am: 5a195b89" into rvc-d1-dev-plus-aosp am: dca875c0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11707398

Change-Id: Ia8782acb30732df62780c4b8ea1b593ae80631ed