Merge "Ensure embedded window's channel is not disposed before being duped"...

Merge "Ensure embedded window's channel is not disposed before being duped" into udc-qpr-dev am: fd074620 am: 76985aed

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



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