Merge "IAudioFlinger: fix incorrect audio patch handle" into sc-dev am: 3718813a am: 67ddd5c8 am: 0e4e3d9a

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

Change-Id: Icb475beb3858f8afeec4fdb7e6e6706b2f53d4ce