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

Merge "Revert "Fix the potential memory leak issue caused by setExtension."" into main am: d34c9b3d am: b4e9bd13

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



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