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

Merge "Merge "Increase test timeout for failing expensiveobjects test." am: 82af3a18 am: 4ee1296e am: 61a5da59" into udc-dev-plus-aosp am: ac384f4e am: 18c16133 am: 0bd03e16

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



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