Merge "Merge "Avoid callback leak in ComplicationHostViewController" into...

Merge "Merge "Avoid callback leak in ComplicationHostViewController" into tm-qpr-dev am: 0348c776 am: db5c344b" into udc-dev am: b347fede

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



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