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

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

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