Merge "Fixed cts failure of WindowInsetsControllerTests" into tm-dev am: 8f1320d8 am: 3e4f0b78 am: e1a5210f am: f3e0fa86

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



Change-Id: Ib8ea706a661356d3c5f35f1dbdeb89bf7f390417
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>