Merge "Fix content insets calculation error when taking task snapshot." am: fe0504b2a9 am: 6f82d9993d am: e81864371f

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

Change-Id: Icf8e64551e19e477d06c17f37c238ed773ec3190