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

Change-Id: Ib7237a8a06327f73fbc947e585ce5999cd087e3f