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

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

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