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

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

Change-Id: I47f485fd6bb3c82bdfff543efc6c52b1e2f1772a