tree 812e090bab6725044883969e222a537dc6702d47
parent 307f4134e551f798770c88ae87841e406135e977
author Pengquan Meng <mpq@google.com> 1566507947 -0700
committer Pengquan Meng <mpq@google.com> 1568332490 +0000

Add brandOverride back to IccRecord

During the spn refactor ag/7013869, we remove the brand override from
IccRecord. This will cause a problem when the ApnSettingUtils use spn to
match mvno.

We add the brandOverride back to the IccRecord and create a method to
get the service provider with brandOverride.

Bug: 139056894
Test: atest TelephonyProviderTests
Change-Id: I519e0d923386863a2990082088a85763f04e6af4