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

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

Change-Id: Ic44287b6a812466d921e26e05683c4f3e4468d3a