Merge "Revert "WindowInsetsController: Address API feedback"" into rvc-dev am: 1a183578 am: fdbdd89d Change-Id: I335d854fcc9bb33466d0ce0d82a4fd4b43e3f3d0