Merge "fix memory leak in initilization and finalization" into sc-dev am: d2b28040

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

Change-Id: I15a12fd21a05d51f4f998ca533f1f03017fb6c9e