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

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

Change-Id: I7af1e4999cfeda332330f88e9ccce2ede51125ec