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

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

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