Merge "dynsystem: Fix memory leak" am: a2271921 am: c066ef1f

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



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