[automerger skipped] Merge "Update Sim toolkit icon to material design." am: e89ed71fd2
am: 083c3c6b10  -s ours

Change-Id: I36d745caf1e5beb8c0374adfadfefbaf454e96c4