Merge "Fix to show eUICC preference in eng build"