tree b1bbb2091085c3bb8e728c7d801a17fb58338347
parent fa11e96aa54c7fce3bc6cf025d51110f3fb5a531
parent a67d6ece41d0df36bf7192496acea94d07111182
author Miguel Aranda <miguelaranda@google.com> 1687959724 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1687959724 +0000

Merge "Extend ExpensiveObjectsPerfTest timeouts." am: 79572ee42e am: fbaae95af6 am: 52644bc496 am: 723b0849ca am: 66ae1a15cb am: a67d6ece41

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

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