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

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

Change-Id: Ifa5a992cdfd575ddde442f1e7df4ceb5c6a786c3