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

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

Change-Id: I58200474167ee42d8f15f711ca50e7f9c528d792