Merge "Update dirty-image-objects" into main am: 0ce8ab8936

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

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