Merge "Remove host activity association when removing EmbeddedWindow" into udc-qpr-dev am: 5d425594bb am: 1575a2ea26

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

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