Merge "Extend ExpensiveObjectsPerfTest timeouts." am: 79572ee42e am: fbaae95af6

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

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