[automerger skipped] Merge "Remove bulk compare code" into main am: 299bfc58...

[automerger skipped] Merge "Remove bulk compare code" into main am: 299bfc58 am: b6bd8cf2 -s ours

am skip reason: Merged-In I3e3dbb36e4f687619378d6f4a13b0f713794746e with SHA-1 79a3d91e is already in history

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



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