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

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

Change-Id: I0784c45f2f33ae36fe7c9cefe9197e080053b71e