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

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

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