Merge "AudioDeviceInventory: reapply preferred device roles when needed" into udc-dev am: 49d88aa3 am: db8c552a am: 54ac8e49

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



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