[automerger skipped] Merge "Fix broken test by increasing Thread#join timeout"...

[automerger skipped] Merge "Fix broken test by increasing Thread#join timeout" into main am: f6020de5 am: afe15ab9 -s ours am: 75495e55 -s ours

am skip reason: Merged-In Ie8ff85d8fc52ae9e9d80778131afc0bf8a8eedd6 with SHA-1 4c2d9589 is already in history

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



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