[automerger skipped] Merge "Update Consumer usages in WindowAreaComponentImpl"...

[automerger skipped] Merge "Update Consumer usages in WindowAreaComponentImpl" into tm-qpr-dev am: 4514e31e am: 6b23032e -s ours

am skip reason: Merged-In Id9d63497c03f7dace9846714c6e2f0fe44ca454d with SHA-1 97bb23e2 is already in history

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



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