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

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



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