Merge "Fix lint error getSystemService for EuiccManager" am: 97245795e7
am: 3856b9e7d4

Change-Id: I17624a0938e42d1d071cda76fb36c8c979ef622d