Merge "AudioDeviceInventory: Fix for switching leaudio active/inactive" am: 810cf114cd am: 94964fc768

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1928153

Change-Id: I0e39b9f7cd5ca8b68bc00d42a342ff21c9939749