[automerger skipped] Audio r_submix : Replace usage of portId by device...

[automerger skipped] Audio r_submix : Replace usage of portId by device address am: 18d823f2 -s ours am: c3f7f07a -s ours

am skip reason: Merged-In I8dde3d59e488c9621dce78ffd5249254ecfc0b1a with SHA-1 2e460345 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/24288190



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