Merge "Use getter instead of member for IEuiccController stub." am: 6991266aa6
am: fe8ee59db5

Change-Id: I96f4cca6ca0f1f75e2fd32123e6cc3d8769ce348