Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev am: 146db0e46b am: 3a85bd8f9a

Change-Id: I7c9e2336d755134edb0dc3ca386c6dde7cfe186d