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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5070ec1f948d3fee3eacf5f6069417b8c7d7474a