Merge "Waiting for idle in test" am: a5ff3b537c

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia335a4fedabed9eed6465d08e5ea882c259539e1