resolve merge conflicts of 0cc0d229 to pi-dev-plus-aosp

To add test testHeaderReadFromOldController into
HeadsUpAppearanceControllerTest.java and conflict with
testOperatorNameViewUpdated.

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: If7d7961dbc12346484f3d139bdc808a53abc6c46