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

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



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