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

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

Change-Id: I685c36507795c80de1bc2f8d12fb1695b92cac78