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

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

Change-Id: I52b3e75cb79c55b0cb72b63fa7d19942c584e04a