Merge "Revert disabling of eSIM wipes/retains." into oc-dr1-dev
am: acdcf37e4b

Change-Id: I10cc2501e38837f816c564716a6d157bc8f57ed6