Merge "fix potential leakage issues" into main am: 919ba007

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3381868



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