Merge "AudioDeviceInventory: reapply preferred device roles when needed" into udc-dev am: 49d88aa34b am: b3284ba64f

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

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