Merge "EuiccManager handles multiple eUICCs using cardId" am: b39f47fe46
am: 3f944f197c

Change-Id: Id1e9a16e223505377a2933ac67b0da439d34ac5f