Merge "Fix InsetsConsumer leak" into rvc-dev am: 296855fe76 am: 85ba727a85

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11935094

Change-Id: Ia8386794aaea2aa3a27289271149f186fcda7573