Merge "Add brandOverride back to IccRecord" into qt-qpr1-dev
am: 61833e108e

Change-Id: I04b8413bc1606c5a49555223a8a14af45468af92