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

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

Change-Id: I7ea215c9e5f6a2d95d5f17f643bb1fd6d7172044