Avoid multiple map lookups

We directly use erase(), and its return value, so we only need
to look up 'deviceName' once.

Test: TreeHugger
Bug: 191248460
Change-Id: I7c229e7d1de5f76071f55f965eab447b6c868bcc