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

Change-Id: If5106972654149f5cb53aedae45964397dcfb69d