Merge "Some of header changes for partial convo settings" into rvc-dev am: e9c530e9 am: ddf5e3e9 am: 0ff7140a

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

Change-Id: Iaebcd34ee0ec39da9c9d82aa45a3db330d827a89