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

Change-Id: I966dc0f349a182882e847ed9f76b0bb602489d26