Merge "Explicitly remove InkWindow from WM" into udc-qpr-dev am: 954b82a4e1 am: 148625054e

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

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