Merge "Move eSIM factory reset implementation to RecoverySystem" into oc-dr1-dev am: a249de50d1
am: a6536cc85e  -s ours

Change-Id: I8d60f4a50c46df393774af38f7035ec027460099