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

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



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