Merge "Add EXTRA_WIPE_ESIMS for factory reset of eSIM"