[automerger skipped] Add constructor with type and address for DeviceDescriptor. am: 7946fbe678 am: feb81b60d8
am: c398ff0599 -s ours
am skip reason: change_id I5f9063bd8c756ace77c162e86a8c0dd685da79b4 with SHA1 36e2dea740 is in history

Change-Id: I6cc472fc93365f303787ef1ffde9f32d76c3ae79