Merge "Fix the potential memory leak issue caused by setExtension." into main...

Merge "Fix the potential memory leak issue caused by setExtension." into main am: d392ea10 am: 759259a5

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3453915



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