Merge "Fix WindowInsetsBehaviorTests failure" into sc-qpr1-dev am: 2da350d939 am: 028e367a0d

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

Change-Id: Ic7ee524b937f4e31697af31b5fb2799c0b21c9a6