Merge "Revert "Update dirty-image-objects file"" into main am: 31a796e38e

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3211630

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