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 am: 8727dfe6

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



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