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 am: 7884f90f

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

Change-Id: I67ab3ec1855973e507bf1117d5a5a5f46b32b6ae