Merge "Fix WindowInsetsBehaviorTests failure" into sc-qpr1-dev am: 2da350d939 am: 271c52a9d7

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

Change-Id: I298ae1fa90744168510741bb6253745f8f00c5cf