Merge "Add overlay files to layoutlib res.zip" into main am: d93f5598

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



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