Merge "Fix lint error getSystemService for EuiccManager" am: 97245795e7 am: 3856b9e7d4 am: 3a2c7a7fa3 am: 00de76a6c1
am: a2877f69b1

Change-Id: I71a800d70bf2892200fe40d22bbcadff07f6521a