Merge "Add waitforIdleSync() to fix timing issue" am: db8929d62d am: ae5f5d43ed am: 72afb4b3e0

Original change: https://android-review.googlesource.com/c/platform/cts/+/1556467

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id63f2e0e3be2bb31d7471431efc727706cb583f7