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

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

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