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

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

Change-Id: Ib2870024a5b0dd960606e10b00a67d80babc9231