tree 3617c47ac17739852bdc17b8a789ee51aee30952
parent 65482b06a4fd1f54946bc4e4bec0f558f4a52f42
parent f5612f37ad0f0fc6a5117b718ee2330326ad5101
author Kazuhiro Inaba <kinaba@google.com> 1684982769 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1684982769 +0000

[automerger skipped] Merge "[RESTRICT AUTOMERGE] Fix CTS test failure by skipping LAUNCH_PERMISSION_SETTINGS permission" into pie-cts-dev am: d63e6ac8d6 -s ours am: cfb598b555 -s ours am: 6827512931 -s ours am: f5612f37ad -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/cts/+/2596133

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