Merge "Merge \\"Fix missing header text in notification groups\\" into nyc-dev am: a275ec269f am: 78f525b674" into nyc-mr1-dev-plus-aosp