Merge "AudioDeviceInventory: reapply preferred device roles when needed" into udc-dev am: 49d88aa3 am: 5de1393f am: 287ca08b

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



Change-Id: I654f450d5058092c4eed6253c319f4ea6162f771
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>