Merge "Include insets in bounds with restricted aspect ratio" into sc-dev am: d529b061

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

Change-Id: I86e1fcd37f1cb99e81f95e311b049a65c81d4b30