Merge "Fix the inconsistency of action EUICC_FACTORY_RESET" into oc-dr1-dev am: 669f560338
am: 8ba767faf8

Change-Id: I5997eb08a2cd3dfa0614b075c27de5fd89478abf