Merge "AudioDeviceInventory: fix unsynced preferred device role when reapply" into main am: cde6d1735e

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

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