Merge "Increase test timeout for failing expensiveobjects test." am:...

Merge "Increase test timeout for failing expensiveobjects test." am: 82af3a18 am: 4ee1296e am: 61a5da59

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



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