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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8097c4fc518a6920026c2db5ea902ae21e1172a1