Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev am: 146db0e4 am: 3a85bd8f Change-Id: I7c9e2336d755134edb0dc3ca386c6dde7cfe186d