Merge cherrypicks of ['android-review.googlesource.com/2989155'] into 24Q2-release.

Change-Id: I51085efe41968ae4288476049a33ee5f249b5e5e
This commit is contained in:
Android Build Coastguard Worker 2024-03-07 20:57:19 +00:00
commit b5bc04e9da

View file

@ -14,6 +14,7 @@
limitations under the License.
-->
<configuration description="Config to run keystore2_client_tests device tests.">
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">
</target_preparer>