Merge "Refactor DiffStatus into a class" am: 5eef9c8c1a

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

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