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

Change-Id: Ia5f2a3273a09fe457ef913fb8c0d37791b52bf68