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

Change-Id: Ib4b10cf44301d0246e0fa252c23529785ac33346