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

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

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