Merge "audioflinger: avoid removing the same effect from the audio HAL twice" into sc-dev am: ca26c2d97c am: 228409ad57 am: b1ef25954d

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

Change-Id: Id472613a637a1f64d84b3d7d4f16039fc98375c9