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

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

Change-Id: Ib327400e2a4fed32e19f7b013e0db80c089ee6c7