am 4f295fe8: Merge "Clean up WindowInsets API for release" into klp-modular-dev

* commit '4f295fe8c66ef2878d93be420f73745d88422e35':
  Clean up WindowInsets API for release