summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-13Snap for 11211173 from d6dc57d2fe4a9b62e47cd2679932094081da3157 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I4b5ad10b15ffbb9592edc42582f29d284dddbb00
2023-12-12[automerger skipped] Skip VtsVndkFilesTest.testVndkCoreDirectory for version ↵Hsin-Yi Chen
35 am: 0f905a05c1 am: e3c902f8ac am: 226d2c64e4 am: 8f8a9c63d7 -s ours am: 69b0b31197 -s ours am skip reason: Merged-In I9aba61338a10a15682ddc97ae7a139ee0822856c with SHA-1 0f905a05c1 is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: I536abb85428a5a56cb9d2efa614e198974168c94 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12[automerger skipped] Skip VtsVndkFilesTest.testVndkCoreDirectory for version ↵Hsin-Yi Chen
35 am: 0f905a05c1 am: e3c902f8ac am: 226d2c64e4 am: 8f8a9c63d7 -s ours am skip reason: Merged-In I9aba61338a10a15682ddc97ae7a139ee0822856c with SHA-1 0f905a05c1 is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: I7f5a3699967313f95989eafe2821050bcab62c7a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12[automerger skipped] Skip VtsVndkFilesTest.testVndkCoreDirectory for version ↵Hsin-Yi Chen
35 am: 0f905a05c1 -s ours am: a51a0835be -s ours am: 8b1f93b51a -s ours am: d7aa149cdf -s ours am skip reason: Merged-In I9aba61338a10a15682ddc97ae7a139ee0822856c with SHA-1 50635e629a is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: Icd216eccb887a236d3abb928a1d8fbf5f6aafb11 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 0f905a05c1 ↵Hsin-Yi Chen
am: e3c902f8ac am: 226d2c64e4 Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: Ic039d56df3dfbda354ff3138aa8f4edcd97a5af7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12[automerger skipped] Skip VtsVndkFilesTest.testVndkCoreDirectory for version ↵Hsin-Yi Chen
35 am: 0f905a05c1 am: e3c902f8ac am: 32a0d8374b -s ours am skip reason: Merged-In I9aba61338a10a15682ddc97ae7a139ee0822856c with SHA-1 50635e629a is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: Ia5619519177ea33273929027570bd79a1f78b131 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12[automerger skipped] Skip VtsVndkFilesTest.testVndkCoreDirectory for version ↵Hsin-Yi Chen
35 am: 0f905a05c1 -s ours am: a51a0835be -s ours am: 8b1f93b51a -s ours am skip reason: Merged-In I9aba61338a10a15682ddc97ae7a139ee0822856c with SHA-1 50635e629a is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: I0d1c8ec2d3804f43a0746dbb98e14eaf7c6a7c67 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 0f905a05c1 ↵Hsin-Yi Chen
am: e3c902f8ac Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: I1ce765fe1080f5c70aee1ec2c81afe0795f23e9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12[automerger skipped] Skip VtsVndkFilesTest.testVndkCoreDirectory for version ↵Hsin-Yi Chen
35 am: 0f905a05c1 -s ours am: a51a0835be -s ours am skip reason: Merged-In I9aba61338a10a15682ddc97ae7a139ee0822856c with SHA-1 50635e629a is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: Ib4ef5660f642f98313285337d8ce95e2287ab622 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 0f905a05c1 ↵Hsin-Yi Chen
am: e3c902f8ac Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: I1f5694a1225a2ce7dc9cd752ca137af5a4d2a414 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12[automerger skipped] Skip VtsVndkFilesTest.testVndkCoreDirectory for version ↵Hsin-Yi Chen
35 am: 0f905a05c1 -s ours am skip reason: Merged-In I9aba61338a10a15682ddc97ae7a139ee0822856c with SHA-1 50635e629a is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: I94a72f5a5aafc9c10932d55f341575af81c13cd6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 0f905a05c1Hsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2857227 Change-Id: I4087924933e40010246f9f5fc29c9ccc80be123c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-12Snap for 11206181 from 98decf3adfda3aeef3e9973aada828221021e628 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I91ec0661c27bf3e37ae328100b36af8b1a83a4e1
2023-12-11Merge "Load LLNDK list from device" into main am: 9072defadc am: dc082f57e0 ↵Hsin-Yi Chen
am: fdc4f77435 Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2864427 Change-Id: Ifb61f66cb61338e084cf728473cf25fa584f3e45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e3e2a5ab93 -s ours am: ↵Xin Li
494ca709a0 -s ours am: 9ce17986c2 -s ours am skip reason: Merged-In I388a26fa5b2799656d585edd2b37b95fff3b9891 with SHA-1 ab59a93882 is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2866437 Change-Id: I7b8a0c567b0847949915cbb2225cc494788d0d70 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Load LLNDK list from device" into main am: 9072defadc am: dc082f57e0Hsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2864427 Change-Id: I469693cf6260b0ab7a3dddcc4f3f369fda2f7b53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e3e2a5ab93 -s ours am: ↵Xin Li
494ca709a0 -s ours am skip reason: Merged-In I388a26fa5b2799656d585edd2b37b95fff3b9891 with SHA-1 ab59a93882 is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2866437 Change-Id: I8e285676481b753182656fe96b2e3b6bc1f2f2f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Load LLNDK list from device" into main am: 9072defadcHsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2864427 Change-Id: Ia52345b7fd13273ac6e9201d9675a887ca3f2d99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11[automerger skipped] Merge Android 14 QPR1 am: e3e2a5ab93 -s oursXin Li
am skip reason: Merged-In I388a26fa5b2799656d585edd2b37b95fff3b9891 with SHA-1 ab59a93882 is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2866437 Change-Id: I6387e5eb9f1416a26c64e1c2ea23858f1c5b67cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-11Merge "Load LLNDK list from device" into mainHsin-Yi Chen
2023-12-08Merge Android 14 QPR1Xin Li
Merged-In: I388a26fa5b2799656d585edd2b37b95fff3b9891 Bug: 315507370 Change-Id: Ie63617bbe345e423811f28e30dc31504d1b4c2f5
2023-12-07Load LLNDK list from deviceHsin-Yi Chen
VTS used to load LLNDK list from the text files built in the test binaries. The files will be removed after VNDK deprecation. The tests read /system/etc/llndk.libraries.txt instead. Test: atest vts_vndk_dependency_test vts_vndk_files_test Bug: 315256423 Change-Id: Ic94a53b317b8b7a4e175159a88b35955dedb56e7
2023-12-05Snap for 11175020 from a75a14e7f4eeb905805d0a7d9ed8db89a19b9a83 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Iccbf3b85328dee0772326f38ab7578f65fa94d4d
2023-12-04Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 50635e629a ↵Hsin-Yi Chen
am: 4241cefb25 am: bc36bc8fff Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2856611 Change-Id: Id09ec9c1a5ad32c32441b8b00b7f18808c225ee4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 50635e629a ↵Hsin-Yi Chen
am: ab59a93882 am: e0b4525dcb Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2856611 Change-Id: I1d4dcb6c280db9edc2821a9f97f41cb6c65fe80f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 50635e629a ↵Hsin-Yi Chen
am: 4241cefb25 Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2856611 Change-Id: I7528437ede6e02cfa226826f127173ac06170716 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 50635e629a ↵Hsin-Yi Chen
am: ab59a93882 Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2856611 Change-Id: I956bbf83cb059f053b5c4081007ff0861f7adfa5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 50635e629atmp_amf_315507370Hsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2856611 Change-Id: I388a26fa5b2799656d585edd2b37b95fff3b9891 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35 am: 50635e629aHsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2856611 Change-Id: I121b1249cb659bc71bd92a2d3f9e4a38451aabe7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-04Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35Hsin-Yi Chen
Test: atest vts_vndk_files_test Bug: 309880956 Change-Id: I9aba61338a10a15682ddc97ae7a139ee0822856c Merged-In: I9aba61338a10a15682ddc97ae7a139ee0822856c (cherry picked from commit 50635e629a8a91690bfd1434e4791a7ecca40f5e)
2023-12-04Skip VtsVndkFilesTest.testVndkCoreDirectory for version 35Hsin-Yi Chen
Test: atest vts_vndk_files_test Bug: 309880956 Change-Id: I9aba61338a10a15682ddc97ae7a139ee0822856c
2023-11-14Snap for 11089623 from d7e97900a8ba9112a8bd63118c6321709575fed0 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Iaf3441f88e75cb856acccbba73988d86722a5b17
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 am: ↵Hsin-Yi Chen
b4001f4060 am: e6a08c31aa am: d88399453d -s ours am: 9a9d3518f3 -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 00357752d5 is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I5bfda5dc49474528b8131e80878668a2fd9d4889 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 am: ↵Hsin-Yi Chen
b4001f4060 am: e6a08c31aa am: d88399453d -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 00357752d5 is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I16ad7e4108b6c215abd2fff91ef6e7582c013e8d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 -s ours am: ↵Hsin-Yi Chen
354e683c3e -s ours am: 84b7062f36 -s ours am: 5298e591f1 -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I8cbbbb84686d29abeb22be84ed8536ca65e19826 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 am: ↵Hsin-Yi Chen
b4001f4060 -s ours am: c11e722d62 -s ours am: 62ebefba63 -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I60dbd06a1b5669ed59137adea358c4517d12f5f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 -s ours am: ↵Hsin-Yi Chen
354e683c3e -s ours am: bfbaae7327 -s ours am: 194436c61e -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I683d371ccb21abbd66544fe73a7e919644b8c7c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 -s ours am: ↵Hsin-Yi Chen
354e683c3e -s ours am: 84b7062f36 -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I0e50921e23e7e240690f0fc9b86b9ed8b3a5fef6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 am: ↵Hsin-Yi Chen
b4001f4060 -s ours am: c11e722d62 -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: Ia721469afb54ccfac864155ab50671d85b32e476 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13Relax the tests for VNDK 35 am: 00357752d5 am: b4001f4060 am: e6a08c31aaHsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I9cc889f1842445d06b372b301cc4bcc47b9d11a4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 am: ↵Hsin-Yi Chen
b4001f4060 am: 432602aa51 -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: Ic5f5d7a1d5350f56a7677cb29dcbf6a4f2a8f7b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 -s ours am: ↵Hsin-Yi Chen
354e683c3e -s ours am: bfbaae7327 -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I24eec994ae5e61b572d88104e43425322f89e65a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 -s ours am: ↵Hsin-Yi Chen
354e683c3e -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: Iae952b5754d1875b34e6c359bc90c1bb99cf84c4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 -s ours am: ↵Hsin-Yi Chen
354e683c3e -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: Id5f91a0237e0240a4a868e8d67bbff6a1ffd59b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13Relax the tests for VNDK 35 am: 00357752d5 am: b4001f4060Hsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: Iab0073cb8a43888ff4497b275e8b772f9049540e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 am: ↵Hsin-Yi Chen
b4001f4060 -s ours am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I6df5727bd942b4883032ad6a8e8e95a8983c10b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13Relax the tests for VNDK 35 am: 00357752d5 am: b4001f4060Hsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: I9f7e6884f48215172d35b33e93987bec8c4555d2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13[automerger skipped] Relax the tests for VNDK 35 am: 00357752d5 -s oursHsin-Yi Chen
am skip reason: Merged-In I519522b6d11dd50182a6f30237f697a48c8b752d with SHA-1 075c80cd4b is already in history Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: Idcccf4e4465dfd9692a84591b71c587b9c73254a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-13Relax the tests for VNDK 35 am: 00357752d5Hsin-Yi Chen
Original change: https://android-review.googlesource.com/c/platform/test/vts-testcase/vndk/+/2824231 Change-Id: Id79f22925422c1f360b4c70e9952ec6420db7101 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-11Snap for 11084970 from f9292b2b434945ac671933e28b075c944e1ce4be to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Iae18fa00a693574710d3445aa926a6d294e06deb