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

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

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