Merge "Avoid storing 'this' in a wp<AudioEffect> while in constructor" into rvc-dev-plus-aosp am: c00a93e486 am: fb6ea88e88

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

Change-Id: Ie3f66cc6a1166b340e3462d7b3bfeb5235d2285a