Merge "Remove CanvasCompare." am: 688256e5d7

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

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