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

Change-Id: I9f7d31bf8ce444a299e645338e3590382af1dbdc