Merge "Clear ZBoost when removing animation leash" into tm-dev am: 2e495889 am: e7a0be63 am: de322f0c

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



Change-Id: Ifdfdde7e406d0b6863a0a9b5c9a649adfa9e23cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>