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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib8f1d47d40942fb30f27d5f2a884a52778efddc7