tree ad59392e279e8ef43b1543686a2e3c142d4a2e97
parent d2572133b15cafb9f670e96f93edd4d6c3fb96a6
parent decaebce1d97f871f80847999063c6ea56cf6b81
author jiabin <jiabin@google.com> 1575534650 -0800
committer android-build-merger <android-build-merger@google.com> 1575534650 -0800

[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