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

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

Change-Id: I721dd6ff71ca6a7842acde81246a7b01f11cd429