Merge "Add EuiccManager#retainSubscriptionsOnFactoryReset API." into oc-dr1-dev
am: f28843dd3f

Change-Id: Ibd7c9c673c9272696cd955ddc50d4b55755d5429