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

Merge "Remove conflict window crop" into tm-dev am: 3fa5b533 am: 94e78c55 am: 35dab9c8 am: e75b1c58

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



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