Merge "Split dirty-image-objects file between art and framework" into main am:...

Merge "Split dirty-image-objects file between art and framework" into main am: 27c724e2 am: 169d3260

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



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