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

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

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