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

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



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