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