Merge "Merge "Remove conflict window crop" into tm-dev am: 3fa5b533 am:...

Merge "Merge "Remove conflict window crop" into tm-dev am: 3fa5b533 am: 6d85f208 am: 0b0c8517" into tm-qpr-dev-plus-aosp am: df2887b9

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



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