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: 9d8908d0 am: 0fb05809

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

Change-Id: I12bd32f6e229c6bfa160e00afde9960d7aa5ab6b