Merge "Remove DiffStatus::opaque_diff" am: 0bfb1a674b

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

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