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

Merge "Merge "Some of header changes for partial convo settings" into rvc-dev am: e9c530e9 am: cbb943e9" into rvc-d1-dev-plus-aosp am: a77bfce4 am: 46f5c737

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

Change-Id: Ie271b66b942c5a8b3ad8ed72920a58627bd31a39