Merge "update_engine: Allow to tag sockets."
am: 8d48aa7988

Change-Id: Ie2439899bf2c369f2f57c6d6b5f55b153917dab2