[automerger skipped] Merge changes from topic "mvAudioDeviceTypeAddr" am: 0287266a3e am: 4f4f865905
am: decaebce1d -s ours
am skip reason: change_id I87f3e59fd01b0b100232d61a9abbc471c61110c4 with SHA1 c52b1ffec2 is in history

Change-Id: Idfb61b754fa90f5683372bc7c3fb99c41747217e