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 am: ec94d27e

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

Change-Id: Ia03ba98068acf9b88b3469391817c80c5743a203