Merge "[Mainline] Remove unused UiccController object" am: e29ca94af4 am: 0c7ec95f35

Change-Id: Ib32da629e9c227cd92e013527e04eb345fa63732