Merge "Some of header changes for partial convo settings" into rvc-dev am:...

Merge "Some of header changes for partial convo settings" into rvc-dev am: e9c530e9 am: cbb943e9 am: d422eb40

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

Change-Id: Ic6632fd2558e81b4c890ec7ab551b4c83d0566cb