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

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

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



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