Merge "Waiting for idle in test" am: a5ff3b537c am: 7c73758907 am: 59afc1a24b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib7ef4eedc0982640b4923885b2deeaefc8081db9