Merge "Remove phone number in eSIM preference Screen" into oc-dr1-dev