Merge "Sleep in between calls to NoMan service in test" into rvc-dev am:...

Merge "Sleep in between calls to NoMan service in test" into rvc-dev am: 4afa50f2 am: e36eeca8 am: 0e4798d1

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

Change-Id: I765b2969e47438fa8f3504892eebddcd252a197a