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

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

Change-Id: I8e23cb51aed4383dafd5d4bc36596e3c13475389