Merge "Clean up UiccInfoEntity unused fields" into main