Merge "Remove CanvasCompare." am: 688256e5d7 am: 0263395aeb

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

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