Merge "Make UiccProfile#getOperatorBrandOverride work as before"