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

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

Change-Id: Ife186be9b03253121a27c634280690a4831b4948