Merge "Simplify the return value of CompareCommonRecordFields" am: 16e50ed2a6

Original change: https://android-review.googlesource.com/c/platform/development/+/2420999

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