[automerger skipped] Merge "Avoid storing 'this' in a wp<AudioEffect> while in constructor" am: d092df14c2 am: 847d798ccb -s ours am: 87a3cc15e5 -s ours am: 27bffb0b30 -s ours am: 07080c2aa1 -s ours

am skip reason: Change-Id Ice5f510b1c9020b5ba73bd6223c1669ab8eae24c with SHA-1 c8e17eebc9 is in history

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

Change-Id: Ic717a8a169be21fa666488d2d1ff4ae2a6f19ff7