Merge changes I304a1e98,I28f093d6 into main am: 3f1ed978

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



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

tools/aapt2/integration-tests/SymlinkTest/Android.bp

@@ -27,4 +27,7 @@ android_test {
     name: "AaptSymlinkTest",
     sdk_version: "current",
     use_resource_processor: false,
+    compile_data: [
+        "targets/*",
+    ],
 }