Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult" am: 6ecc9e3997

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

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