Merge "Build dirty-image-objects in Soong" into main am: f3326ebec9 am: 07663527b8

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

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