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

Change-Id: I77e3763d9bee49ba51bf01a6ee5d0e72b2d9c015