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

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

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