am 5ded06ec: am 40fdd482: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev

* commit '5ded06eca13a91da5ab40890ebfaedeae8c000f2':
  Settings: Update media & alarm stream icons.