Merge "Fix wait condition for SetRequestedOrientationWhilePinnedTest" into tm-dev am: 68e3f55c am: be2563f4

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

Change-Id: Ib9aebfaeecfcede0485b0e725313f774717345fe