Merge "Fixed cts failure of WindowInsetsControllerTests" into tm-dev am: 8f1320d8 am: 3e4f0b78 am: a0eae893 am: 707cd65c

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



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