Merge "Keep insets leash position before display transaction applies" into...

Merge "Keep insets leash position before display transaction applies" into udc-qpr-dev am: 5918648b

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



Change-Id: I60b4dcd1287c95afd06b053d8d70ce2807a3b870
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>