Merge "Fixed cts failure of WindowInsetsControllerTests" into tm-dev am: 8f1320d8 am: c9e64db4 am: 14334a8d am: 60a7f802

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



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