Merge "Avoid Object.wait(0)" into main am: a199526dcd

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

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