Merge "Fixed Handler Leak on WrapperInit" am: 9c7e15ab31 am: d723dd9191

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I14173b39846f2ef92698731b48dd4dd79d361b97