Merge changes from topic "complication-ui-event" into udc-qpr-dev am: 056cc05a am: 18ee2219

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



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