Merge "Fix InsetsState#calculateUncontrollableInsetsFromFrame" into tm-qpr-dev am: 12b430a7

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



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