Merge changes from topics "recovery_prebuilt_res", "target_screen_density"...

Merge changes from topics "recovery_prebuilt_res", "target_screen_density" into main am: 18bad5f5 am: 579810a6

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3391020



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