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

Change-Id: I538f0405811b0df28960acdb6f275689f19185dc