Merge "Merge "Revert "Revert "WindowInsetsController: Address API feedback""" into rvc-dev am: 146db0e46b am: 3a85bd8f9a am: 54ddab39f6 am: cee58b5a05" into rvc-qpr-dev-plus-aosp am: b6b4b01e4e

Change-Id: Ie8271c1628f4e59ca004525ed93de2490e9d1d5a