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

Change-Id: Icacf8c1bc3beee5f9d3db59f448204cc4ed73eb8