Merge "Return DiffStatus from FilterOutRenamedRecordFields" am: 4602059a36

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

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