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

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

Change-Id: I32b36f3a3b93d6353ffaaddba3b62721fbd70b0b