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

Change-Id: I784617e0c34275adc5d177e6728b4b2c86dc1f5d