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

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

Change-Id: Ib75a41ed810e430ba302cfca1fd2043f1d3941af