Merge "Revert^2 "Fix the potential memory leak issue caused by setExtension."" into main am: 7f47fbbdd0 am: a37abfcca6

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

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