Merge "Rename GenericFieldDiffInfo to RecordFieldDiffResult" am: 6ecc9e3997 am: fe3d1b16b4 am: ceb1b92809

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

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