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

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

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

Change-Id: I2e683359d3e78f5f59fe39330704f309382edb63