Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev am: 146db0e46b am: 7676bd5deb am: 9d9ef86505

Change-Id: I8e9f8dc052d7e2b8648cdf8bbc7384d7f669a93d