Merge "Deflake WorkerThreadTest" into sc-dev am: 47264c7a2c am: 686263dd35 am: 7c3f380340

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/14926121

Change-Id: I670aeb7c4e33701daf6ecc26e4749e1342ab4f6f