Merge "Revert "WindowInsetsController: Address API feedback"" into rvc-dev am: 1a18357853

Change-Id: Ic3ce21d6b8a01014f3bbcee6043ca78c01db18b3