Detect watch devices correctly

bug:30117535

Change-Id: Idf8e708fbe92b6034d6278980d2c61946e4b72d2
1 file changed