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

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

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