Merge "Avoid sleep in test." into main am: 6b241447 am: 21c9bbc7

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2893366



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